From 6998a3b451d1e6eb67b8bfd2cfa38eb288f42682 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 31 May 1993 07:21:10 +0000 Subject: [PATCH] (Fx_create_frame): Use bitmapIcon, not iconType. --- src/xfns.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 1652b9db117..8e2884f83b8 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1750,7 +1750,7 @@ be shared by the new frame.") /* We need to do this after creating the X window, so that the icon-creation functions can say whose icon they're describing. */ x_default_parameter (f, parms, Qicon_type, Qnil, - "iconType", "IconType", symbol); + "bitmapIcon", "BitmapIcon", symbol); x_default_parameter (f, parms, Qauto_raise, Qnil, "autoRaise", "AutoRaiseLower", boolean); @@ -2184,11 +2184,15 @@ fonts), even if they match PATTERN and FACE.") FRAME_PTR f = NILP (frame) ? selected_frame : XFRAME (frame); int face_id = face_name_id_number (f, face); - if (face_id < 0 || face_id > FRAME_N_FACES (f)) - face_id = 0; - size_ref = FRAME_FACES (f) [face_id]->font; - if (size_ref == (XFontStruct *) (~0) || size_ref == NULL) + if (face_id < 0 || face_id >= FRAME_N_FACES (f) + || FRAME_FACES (f) [face_id] == 0) size_ref = f->display.x->font; + else + { + size_ref = FRAME_FACES (f) [face_id]->font; + if (size_ref == (XFontStruct *) (~0)) + size_ref = f->display.x->font; + } } BLOCK_INPUT; -- 2.30.2